From: Gert Wollny <gw.fossdev@gmail.com>
Date: Sat, 2 Jul 2016 19:14:35 +0000 (+0000)
Subject: correct patch to also compile with openssl-1.0.2
X-Git-Tag: archive/raspbian/3.6.9-4+rpi1^2~271
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/%22mailto:kde%40ewsoftware.de//%22style.css/%22/%22http:/www.example.com/%22mailto:kde%40ewsoftware.de/%22style.css/%22?a=commitdiff_plain;h=4390c5a237e596ba77c4205d2fff314d3813df90;p=dcmtk.git

correct patch to also compile with openssl-1.0.2
---

diff --git a/debian/patches/09_openssl-1.1.patch b/debian/patches/09_openssl-1.1.patch
index 0a3c03e2..ba9851d5 100644
--- a/debian/patches/09_openssl-1.1.patch
+++ b/debian/patches/09_openssl-1.1.patch
@@ -10,7 +10,7 @@ Bug-Debian: http://bugs.debian.org/828281
  
 +#if OPENSSL_VERSION_NUMBER < 0x10100000L
 +#define SSL_CTX_get_cert_store(ctx) ctx->cert_store
-+#define EVP_PKEY_base_id(key) key->type;
++#define EVP_PKEY_base_id(key) EVP_PKEY_type(key->type)
 +#endif
 +
  extern "C" int DcmTLSTransportLayer_certificateValidationCallback(int ok, X509_STORE_CTX *storeContext);
@@ -84,7 +84,7 @@ Bug-Debian: http://bugs.debian.org/828281
  END_EXTERN_C
  
 +#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#define EVP_PKEY_id(key) key->type;
++#define EVP_PKEY_id(key) key->type
 +#endif
 +
  SiCertificate::SiCertificate()
@@ -153,7 +153,7 @@ Bug-Debian: http://bugs.debian.org/828281
  END_EXTERN_C
  
 +#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#define EVP_PKEY_id(key) key->type;
++#define EVP_PKEY_id(key) key->type
 +#endif
  
  /* buf     : buffer to write password into